From f6ba8909d6be7eb6bc404f5b9f0c489f35bdeb10 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 2 Aug 2004 19:08:13 +0000 Subject: [PATCH] Don't crash if the displayed row is gone. 2004-08-02 Matthias Clasen * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't crash if the displayed row is gone. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcellview.c | 3 +++ 5 files changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index 68265e5977..bf39d4514c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-02 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't + crash if the displayed row is gone. + 2004-08-02 Morten Welinder * gtk/gtkentry.c (gtk_entry_motion_notify): C99ism. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 68265e5977..bf39d4514c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-08-02 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't + crash if the displayed row is gone. + 2004-08-02 Morten Welinder * gtk/gtkentry.c (gtk_entry_motion_notify): C99ism. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 68265e5977..bf39d4514c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-08-02 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't + crash if the displayed row is gone. + 2004-08-02 Morten Welinder * gtk/gtkentry.c (gtk_entry_motion_notify): C99ism. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 68265e5977..bf39d4514c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-08-02 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't + crash if the displayed row is gone. + 2004-08-02 Morten Welinder * gtk/gtkentry.c (gtk_entry_motion_notify): C99ism. diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index cfa82d5de2..880a412110 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -543,6 +543,9 @@ gtk_cell_view_set_cell_data (GtkCellView *cellview) g_return_if_fail (cellview->priv->displayed_row != NULL); path = gtk_tree_row_reference_get_path (cellview->priv->displayed_row); + if (!path) + return; + gtk_tree_model_get_iter (cellview->priv->model, &iter, path); gtk_tree_path_free (path); -- 2.30.2